Added support for customizing behavior