Add support for device feature usage