Several intermediate changes
Added index-attribute