Moved common properties for display and keys together.