Added feature context option to isVariable check