Entity differentiation

Added "Custom Entity" metadata