Add references to Intent and Context