Got rid off IMagicVisitor