Added an indexing and decoration mechanism, and the first basic indices