[PATCH v2 00/49] Batch update and refactor