Improved data saving and extension activation