Updated main interfaces.
Merge branch 'master' of https://github.com/mazenhamza/healthcare