Made it more extendable