Refactor i-api-request events