Improving api