Updated model associations. Updated models to reflect.