Adding initial work for controller support