UniqueIndex ImplementedBy improvements