Make custom entities override built-in entities

Make custom entities override built-in entities #705