Made DB methods less strict