Added more concrete types and changed some fields from Any to the concrete type.
Added more concrete types and changed some fields from Any to the concrete type.

rkavalap/NightWatchTest,rkavalap/NightWatchTest