Refactored around fill for any entity