Jade improvements

Improvements to Jade support