Enhanced restart behaviour