Beats can field structure refactored