Simplified parser code