Updating api according GangOfBB meeting, updating documentation.