Added Device and Command params for widgets