Improved Hexdata parsing