More work on Advanced Api pipe.