Added support for custom variables