edit type to include entities