Scaffolded notes and added indexing on types.