Let's get rid of the ``*args, **kwargs`` and just accept ``metadata, storage``