JML-support revised