Add plugin methods for new APIs.
Clean up naming.
Clean up.