Feature/new ci matrix