Added widget support