Updated support for Sundown