Separate containers and relators, remove 'contains' predicate