Improved modules in DATATYPE namespace.