Feature/database redesign