Resolve OBANYC-1624: Inferred State/Phase Discrepancy - additional
classes