Add support for multiple instances of a property