Change api a bit