Removed separate type of FSM constraint and integrated logic into standard constraint