New database structure
Routes fix