Readded support for indexed arguments