Handle newly refactored basebundle in order to work with ctc-templateproject