added storage functionality