Another small refactor of beat config