enhanced the data type handling and added support to comments