Added front end storage class