Some methods reordering in the api module