Added option to force none strict variable resolution