JAL-1421 typed map / lists, explicit imports, method refactoring