Minor changes

Completed some storage classes