First working version with full support for price indexing