Complete models that properly (un)marshal