Not for this PR, but do you think there's a way to abstract this piece of logic away? :\ It's quite repetitive across all factories