Added minimal refactors on retrieving entities