Removed entity contents check