Updated api and net code