Allow runtime tag changes

Please review. 

Please also read my comments on Skype as this might result in simplifications :)