Improving Semantic Parsing with Enriched Synchronous Context-Free Grammar