More API refectoring
Merge pull request #74 from sumerjabri/master

More API refectoring