Added NULL default to entity class argument