entity type is now using type param instead of class
Merge remote-tracking branch 'origin/v1/forza-init' into v1/forza-init