API improvments