Add support for extinction