Added NSUserDefaults substitutions