Add more validation