Add Comments and Emoticons modules