Added storage functionality