Refactor point mutations - removing zip