Added TODO classes in AI module