Added initial work for custom variables