Added support for badge per device