Enable support for multiple fields