Removed duplicate code for entity ownership