[#67] Update DB references to use new Constants