Documented Factory class
Removing `static` flag