code refactoring (jaxb annotations and fixing BigDecimal problems)