Make factory a singleton.
Convert into a singleton via an enum.
Add new constant.