Revise/refactor all API methods.