Add tags to core
Fix of merge