Adds support for duplicates in states