Added parsing of attributes into JSON array for non-batch entries