Improve writer