Invoke improvements