Added comments, fields, partials