Added context variable support