refactor corona apis