Modernize DatabaseCollection