Enhance API Code