Expanded required validation slightly