Almost done - still need to cross commons-configuration