Moved most of the data parsing to MCBuffer