Big API polish