Added step tokens to be able to share some values between criteria.