Updated Index

Updated Index to handle new basic functions.