Adding better ignore fields support