Added octree support