Added Map Attribute Support

Because you know, it's needed.