Refactored database object injection

Now uses default database object injected into model class