Finish save implementation