Added handling of dynamic attributes