Added support for additional methods.