Added regexp conditions