Simplified parsing code