Updated model and added UncoupleNode