Change construction from factory to constructor