Simplified estimation part of the API, applied consistency corrections.