Spec changes to controller; State enum definition