Removed dependency on hub