Add unless and with