New version of machine layer to match the new native messaging layer.