Multiple Fields

Now supports multiple fields