Refactoring for APIlist