move Sink metadata elsewhere