added classes of legacy system to baseline