Updated entity creation to use State factory
Forgot to update engine