Convert to using custom repository for doctrine query wrappers.
Convert to using custom repository for doctrine query wrappers.