Fixed structure map issue, getting ready for parse