Add strict_varaibles support