Added simple support for adding and removing tags