Added ability to omit fields