Use updated factories

MSP-9228