WIP: Added support for Indexes