Added more db models