Updated nested set model