Update for 310 and JavaMoney