Entities overhead

@Joachim_Ante_1