Add time mangement for score calculation