Updating to latest schema. This time in development branch...