Expanded validation