Added server, service and session