#211: small refactoring of BuildList model