Add logic for universal widget construct