Updated some parsing