Peter - More Updating for Database classes