Fix cyclic dependency in ProfileBuilderService