Adding hashtag support