Added tag support
1.2.0