Better time marker handling