Now allows entities