adding better service life cycle handling