Added patch to make
Removed strict entity definition
Changed to proper entity types