Add fast-path for empty entity