Refactor/nested controllers