Redesign harbor/master/dummy service