Changed entity saving and creating. Remove old entity type.