Add timing support
Port to 0.8.5