Modified TB to account for latest changes in core entity.