Add preliminary support for URL variables.