Some complex `key_source` properties have been introduced. They need to be simplified to improve performance. Let's review together.