Changes in line with ml4j-core