Refactored writes