Tweaked GetOrDefault API and added string version