finishing with api-core refactoring and firewall service