Added AF, EG to CTL parser