Added support for KeyProperties