Break logic improvements