Proper mode swithing command support