Added hashtag support