Added extra property key and logging