Added support for more customization options.