add validation and other storage classes