Added a REST 2.0, needs to be tested