added event source tracking support and light scheduling feature