Updated schema

Further updates to DB schema