Updates to support custom extension.