Database handling improved