Updated acccording to last model changes