Refactored to use entityNeedsEntityTypeColumn: method where needed