Fixed bugs and added bundle type in operations