Implement non-variant default and change key names