Added code from ServiceHost branch