Remove dependency with 'extend', replace it with 'tree-kit'