refactored api mapper. introduced app-loading