Making ExtendableMap better