Added runtime time management