Improving syntax support