Add check for storage identifier.