Another refactoring of the core, fix wrong request calls.