JADE support added