Recommended drink tracking app

Hi, I have been using Drinkaware for about 12 years now, but it is pretty much still the same as it’s always been.

Does anyone use a better app with a bigger database for the different drinks available now or better still an app where you can scan barcodes? Thanks