APIs refactory