More work out db schemas