Fix parser integration