improve javaMapper