Buffed out the datatype specifications