Add attribute forest support