Rework 'extract'-implementation

Now we can expose it again!