Added controller support