Significant change to models

Client compatibility.