Better formulation of method
Made OxEntityList generic; refactored a bit