Upgraded grid and added base KeyValueModel