Add support for display names