Change some APIs