Improve handling of unique instances