Added more XML comments