improve Data/Model/Database.php and Data/Source/Database.php