CHANGE: Change schema and add lucene function