Added Missing Fields and Views