Updated model and schema based on change log - mostly completed