Added support for datatypes in patterns