Bug fixes
Merged Maps class with ExtendedCollections class