Migration to the new widget model