[misc] Make easier to extend