Add some more funny stuff in the api