Updated support for Elk 1.0.1