Working on DEVELOPER-281

Adds some metadata needed for DEVELOPER-281