Added tag support to --add