Revised Migration System that supports all types of command sender