Added "id" field, resolves #103