Implement rest methods
Implement rest methods and bugfix