added option to not validate timestamp