Added a utility to handle two database types