Added inv stuffs to support an extension.