Added variable references into defaults