Varous. Slim down Collection class.
Various updates
Updates to Database modules.
Updated ModelTest