Make API/interfaces more reasonable and simple.