Brought more model/table skeleton up to date