Adding better badge support.