Added invoke handling