Added controller implementation