Simplify dependencies
Renamed factory method and default file hander mode.
New factory method
CS fix