Changes for beslist feed and minor refactoring