API blueprint refactor.