add qualified variable support