Added Resume Support and Display Manager