Service redesign; renamed helper file;