Adding support for enabling timestamps