Changed timestamp to string for now