Optimize and break up parsing