Added changes to TimeStamp and BaseThread
Added missing BaseThread