Small Api improvements