Feature/self db