Added ws timestamp support