Improve save operation (speed up)