Changing Entry.Attributes from custom type to map