Support new scalar fields in controller layer