Update Database class

Update 2edae63d6a33ad6499d47d87684a1bf58e132ddf