Added more general model