Feature/architecture