some provider and several datamodel additions