Beats.Entity reformatted