More preparation for AI integration