Added support for data persistance/storage