Make it possible to use custom variables, a prerequisite to doing v6