DO NOT MERGE: Fixing Entities

Perhaps set `max_len` to 1000?