Adding widget support