Clean up code
Update query dispatch API
Next iteration for REST service
Add new method #getMembers(Model)