Added extra conditions param