Instance index

Also fixed propagation bug