Better support for Lethal