Added time management