Added server functions and classes