Fixed incorrect parent class of storage