Port of EntityHome and EntityQuery from seam2 to seam3