Added terminator component to replace termination.
Added identifiers to terminator criteria.