Added Aida-Internal