Added support for unique properties