Changes for new widget version