changes to support hosting in service