Cleaned up CA API - resulted in much simpler simulation description