Added more with statement info