Improvement of API.