Add option to skip bundle