Added final validation