BUG-620: replace xtend version of classes with Java versions