Make clause more universal