Added application related changes