Update to state and custom parsers
Clean up