Updated rest repository to match latest implementation