Added support for more methods.