improve entries API