Changes to the metadata layer to support plugin metadata implementations