Made bundle more extendable