Updated to accept timestamp values (which is still ignored)