MultiFileHashMap v1.6 (some OOP fixes)