Fork that adds support for /findNearby and /hierarchy