Improved further how dsl methods are parsed