Api small changes