Add switch to return by hostname