More leaf node support