Added the core server classes