Added display name handling