Updated for Kronos 1.0