Do you think is the right way to go? re-register bundle per widget case?