Added support for two point controller settings