Added server + more doc