Changed Input structure for Model