re usecase matrix improvements