Add $conditions option