Scaffold
Minor vapi updates