Should update internal DB better