Changed array to key-value