Adding handling of 'current hub'