Getting rid of evil data dicts in entities
More testing needed.