Record all ModuleReferences
Fix compile error (must be source code level Java 1.6)
Version 2.5.3