Added mapped index functionality