Fixing api a bit.