Added shutdown methods