More tag support
Tidy up