Added optional/required/excluded validation