Add some parsing stage stuff