Context queue version of m2s is added