Altered database tables, meant to be with last commit. See #3 #9