Fix tree regression issue
Add custom row support