Updated API, Exceptions, and IndicatorEntity