Added metadata resolving to metadata context