Add comments to TapManager