Small refactorings to make api a bit more useable