Add missing scope
Refactor function indexing

It now auto completes method arguments