Replaced old interface with more extendable new interface.