Support for multiple attributes and field name whitespace