Partial refactor api_csay