Java integration improved