Embed controller before refactoring