Add tags support (comments and stuff)