Initial dynamic attribute support.
Fix error in dynamic attribute removal.