Updates to factories, add map exception catching