Feature/change architecture