Refactoring and implemented cleaner code. Objects are composed from REST successfully.
Merge origin/master