Added HashSet and CircularBuffer