Started adding tag support