Added XML comments to remove warnings