Added bundle dependencies and removed lazy activation policy