refactored API support?