Added 'onlyif' and 'unless' parameters