If you're looking at refining it, I think doing the math for ml of alcohol would be a better metric. Then you don't have to worry about type of drink so much as you've got an absolute number that ties them all together and is accurate regardless of location.