Added back support for empty vars