Move the 'contains' logic into an association
Deprecate File.new taking a Base as an argument