Make Storage methods static