SC-67 Refactorings, QueryDSL dependencies