adding only/unless support