Added helpers and metadata resolution scopes