Added Model restructuration