Enhanced the serial/deserial mechanism