Update convert, timestamp tools