ISSUE-2 ServiceBuilder regen