Added include handling