Changing the API names a bit and adding documentation