Move some pipeline elements to API