[wip] Patching up logic for Invokable.
[wip] Patching up invokable.