Improved parser with more cross-referencing