More work done in vapi files