Updated API handling.
API Handling.