Removed dependency on Set