New: Added support for scope in custom variables