Refactor EntityLoader - Interim commit