More implementation with new schema.