are you saying this PR won't merge until all DeviceCapabilities are refactor? If so, I'm okay, otherwise, please refactor base on current code base.