Better architecturee