Added class for uniqueId features