Matrix/vector indexing support added