Fixed some small issues caused by latest commit, composite keys now work! :D