modified models and web apis
Merge pull request #10 from hashinisenaratne/master

modified models and web apis