Refactor Time - Add TimeChanger refer #9552