Finish data storage implementation