Fixes Map class to be backward compatible