Fix class mixing.
Add more apis.