Changed consumer bundling approach to simplify code on target system