No need to include 'Database' twice
Fix Rails4 deprecation errors when getting a collection from an association.