Now using Entry.isBreak and removed configuration