Splitted Builders from Repo/UoW and fixed GetRepository