Updated model with tree method; updated core streams to use model properly