Updated in consistence of new AbstractEntityProvider