Added client side timing and data structure