Additional changes not related to GUI or new services code