Change the place where we keep timestamp
Fix rendering for plugins