Added extra stuff for GZClock management