fixed matrixGeneration steps to use service and DAOs consequently