Added server namespace