<Shashank> Changes for adding state and language preference after final code review comments