timestamp support

Added timestamp support