Still adding fields from entities