Adding controller support

Adding controller support