Small improvements
Api improvements