Add support for automatic suicide