Updated db schema for resolution of issue #22