Fix code after entry api change,
Move both candidates to single file.
Fix aggregate construction for "one_of" dependencies.