adding controller support