Began entity-based approach.