Beats.Entity refactored