Refactored API acceptance