Rewrote the datatypes regex.