Refactor to nested form mapping
Add currency names for Java 6