Enhance/syntax and path improve