Global improvement of API