Refactored and improved attribute consumer service metadata construction.