Moved rest classes into one