Brackets added
Added index support