Changes to reflect Kimball Model default values