Speeding up adding of tags