Cleaned up ProAI classes