Database methods improvement