Fix at schema, additions to model