server.core/base refactoring