Updated model
Updated methods for rest client
Merged remote changes