[misc] Make easier to extend

(cherry picked from commit 22776edbddea9fe1dd9ba364114d7d041190b1e6)