added timekeeper support