Fix CONTAIN/CONSIST pattern, remove COMPOSE pattern