Adds support for saving