Moved CommandReturn to a separate file