Moving some objects to new DB class