Drop dependency on Language in Database package