Make unit more extendable