remove use of AttributesMap
work on markup hooks