Enhanced the Indentable support.