Moved tags into a seperate file