Updates and new (incomplete) validation