Added tag features
Fix conflicts