Filled out indexing, added more general @/src/xxxxxxxxxxx syntax