add naming and storage.