slight improvements to api model