Added Support for Alert Service