Added controller support to input class