Database Switch Moved to Lib