2.3/dev - Fix passing custom Entry model class