Re-introducing bitly support