Moving more things into asset pipeline