Added optional parser override