[master] Add timer
[master] Fix some design