Fix Map Struct