Updated the entity services and dao to use the OpenMRS object interfaces rather than the classes.