Fixed the saving issue and add a new default schema.