Maybe explicitly require TAP?