Added more varialbels to view context