Refactoring
Community api done