Changed TAG declarations and imports