Modified model hydrator to make extensions easier