[misc] Make easier to extend

(cherry picked from commit 3c4672bbb99ac04b33fb9b8ff566deac58894010)