Change displayName to Option String