Add index & prebuild containers