Moves save functionality to container object