Added life cycle management.