Added resolver function
Merge branch 'preset-metadata'