Small api changes