Add support for device metadata