Adapted to new architecture (widget still to be treated)