MAASAUTO-11 added unmarshalling functionality