Api improvments