Adding tiny url support