Added reflection, client timing, refactored