Added time & collider classes