Updated property keys to support an array