Refactor and add stop and start parsing stubs