Add types for storage and instancing.