More fun with Entity & Entities