Added ability to set field names