Readers/Writers to handlers refactoring.