Updated to include timestamp for elasticsearch