Improvement of api