Adding missing const and by-reference argument passing (up to Model for now