Some preparation to add DB check