Added final validation behaviors