Pipeline setup + More bucket simplification