Added visitor and change agg parser