Make atom factory better