Enhance the APIs