database model/schema minor changes