Added Koala API
db schema updated
merge conflicts fixed