fixed storages classes declarations,