Imroved model handler