Added (more) proper timing support.