Updated to invoker changes. Added Browser support