Reduce Factory usage, CS