Adding skeleton wrappers. Updated the schema.