Refactoring of PublicAPI service