Adding support for universal quantification