Simplify hierarchy, remove ConcreteMapLoader, better javadocs