Updated to the latest version of schemas