Added support for timestamp option