Updating final schema for beta