Add controller magic