Add even more entity type control