Improvement in Jevix plugin