added uniqueIdGenerator as dependency