Updated MethodCalls

Now works for all elements