[Anton] Added controller support