Updates for API V2. Should all be working now