Updated Entity classes to better work with the API, updated indicator services, prepared them for CARE #27, fixed a logging error