Added more database tables