Added id and change unit to milliseconds