Add strict_variables support