Restructure for parse