Initial changes to storage component