Added dynamic widgets support