Added extra validation