Add entityType base managing and tests