Refactored Bundle detection into DI and using an extendible array to forward info