refactoring in order to encapsulate bundle into cirrus agent