Rework service host app