Beats Can dependencies organized better