Preparatory changes for deprecating the current gxa REST API