Make sure key property can also be added as value