Added Base classes and started methods on Storage