Bundle improvements
Seperate build methods