moddel embedded object and array defaults fix