Adapting to M10 changes