Vishal #0 Added State to LocationContract + minor refactor