Adding generated field boost factor; minot refactorings