Made some service related changes