Refactoring of writers
Refactoring of writers