Added a NumberFactory