Improved indexing and setup scripts