Refactoring to use the latest interface in karka
Merge branch 'master' of github.com:pvenkatakrishnan/makara