Split DatabaseUtil into spearate classes