rename and add DB class